Do not flag match types as Deferred
and amend #20077
#20147
+55
−6
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.